From 6d4005f65344ca891f776a4098315ecd8c365395 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Thu, 13 May 2010 19:42:33 -0700 Subject: [PATCH] Update for emacs 23.2 release. --- debian/changelog | 19 ++ debian/control | 2 +- debian/control.in | 2 +- debian/copyright | 2 +- debian/dfsg-splitter | 16 +- debian/patches/add-unix-to-cpp-undefs.diff | 2 +- debian/patches/avoid-fakemail-mail-loss.diff | 12 +- .../debian-adjust-mail-from-addresses.diff | 19 +- debian/patches/debian-startup.diff | 10 +- debian/patches/fix-dynamic-menus.diff | 199 ------------------ .../fix-flymake-xmlstarlet-invocation.diff | 4 +- debian/patches/fix-gtk-scroll-bar-events.diff | 115 ---------- .../fix-rmail-capitalized-month-names.diff | 40 ---- debian/patches/handle-dfsg-split.diff | 188 ++++++++++++++--- debian/patches/look-for-news-to-find-etc.diff | 4 +- debian/patches/misc-unseparated.diff | 4 +- .../require-movemail-use-liblockfile.diff | 4 - debian/patches/series | 4 - .../use-zwj-and-zwnj-for-indic-scripts.diff | 39 ---- debian/patches/version-mention-debian.diff | 6 +- debian/rules | 26 +-- 21 files changed, 207 insertions(+), 510 deletions(-) delete mode 100644 debian/patches/fix-dynamic-menus.diff delete mode 100644 debian/patches/fix-gtk-scroll-bar-events.diff delete mode 100644 debian/patches/fix-rmail-capitalized-month-names.diff delete mode 100644 debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff diff --git a/debian/changelog b/debian/changelog index a456689e7d2..5e306cce3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +emacs23 (23.2+1-1) unstable; urgency=low + + * New emacs23 packages. + + * Update debian/dfsg-splitter. + + * Add dependency on libgconf2-dev and use --without-gconf for + emacsFLAVOR-nox and emacsFLAVOR-lucid builds. + + * Remove patches: + patches/fix-dynamic-menus.diff + patches/fix-gtk-scroll-bar-events.diff + patches/fix-rmail-capitalized-month-names.diff + patches/use-zwj-and-zwnj-for-indic-scripts.diff + + * Refresh remaining patches. + + -- Rob Browning Thu, 13 May 2010 19:21:32 -0700 + emacs23 (23.1+1-9) unstable; urgency=low * Fix binary-only builds (dpkg-buildpackage -B) and conditionalize diff --git a/debian/control b/debian/control index 3b28abf5e5b..930b8d603a6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: emacs23 Section: editors Priority: optional Maintainer: Rob Browning -Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] +Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Standards-Version: 3.7.2 Package: emacs diff --git a/debian/control.in b/debian/control.in index 08a9da89588..f4032b8105e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,7 +2,7 @@ Source: @DEB_FLAVOR@ Section: editors Priority: optional Maintainer: Rob Browning -Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] +Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Standards-Version: 3.7.2 Package: emacs diff --git a/debian/copyright b/debian/copyright index a118190a4d2..535ad8fbf82 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. -The original source archive is emacs-23.1.tar.gz, and it +The original source archive is emacs-23.2.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ diff --git a/debian/dfsg-splitter b/debian/dfsg-splitter index 836351c8539..ab67063e6c1 100644 --- a/debian/dfsg-splitter +++ b/debian/dfsg-splitter @@ -7,9 +7,9 @@ set -x # run the script. The resulting two orig.tar.gz files will be placed # into a new ./split-tmp directory. -emacs_archive_name="emacs-23.1.tar.gz" -emacs_dir="emacs-23.1" -emacs_version="23.1" +emacs_archive_name="emacs-23.2.tar.bz2" +emacs_dir="emacs-23.2" +emacs_version="23.2" emacs_major="23" deb_src_rev="1" @@ -33,7 +33,7 @@ pushd split-tmp umask 002 -tar xzf "../${emacs_archive_name}" +tar xf "../${emacs_archive_name}" find "${emacs_dir}" -name "*.elc" -exec rm {} + find "${emacs_dir}"/info -type f \ @@ -124,12 +124,12 @@ copy_to_main_dir "doc/misc/ChangeLog" copy_to_main_dir "doc/misc/Makefile.in" -GZIP=-9v tar czpSf \ - "emacs${emacs_major}_${emacs_version}+${deb_src_rev}.orig.tar.gz" \ +BZIP2=-9v tar cjpSf \ + "emacs${emacs_major}_${emacs_version}+${deb_src_rev}.orig.tar.bz2" \ "${emacs_dir}" -GZIP=-9v tar czpSf \ - "emacs${emacs_major}-non-dfsg_${emacs_version}+${deb_src_rev}.orig.tar.gz" \ +BZIP2=-9v tar cjpSf \ + "emacs${emacs_major}-non-dfsg_${emacs_version}+${deb_src_rev}.orig.tar.bz2" \ "${emacs_dir}"-non-dfsg exit 0 diff --git a/debian/patches/add-unix-to-cpp-undefs.diff b/debian/patches/add-unix-to-cpp-undefs.diff index 84150906938..eaaa9cfeac5 100644 --- a/debian/patches/add-unix-to-cpp-undefs.diff +++ b/debian/patches/add-unix-to-cpp-undefs.diff @@ -19,7 +19,7 @@ --- a/configure.in +++ b/configure.in -@@ -2937,7 +2937,7 @@ +@@ -3072,7 +3072,7 @@ # the C preprocessor to some helpful value like 1, or maybe the empty # string. Needless to say consequent macro substitutions are less # than conducive to the makefile finding the correct directory. diff --git a/debian/patches/avoid-fakemail-mail-loss.diff b/debian/patches/avoid-fakemail-mail-loss.diff index 90e74cc0ebc..23898cf7e44 100644 --- a/debian/patches/avoid-fakemail-mail-loss.diff +++ b/debian/patches/avoid-fakemail-mail-loss.diff @@ -25,8 +25,6 @@ undesirable for some reason, just comment out avoid-fakemail-loss.diff in debian/patches/series. -Index: b/lib-src/fakemail.c -=================================================================== --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -136,8 +136,10 @@ @@ -42,11 +40,9 @@ Index: b/lib-src/fakemail.c #endif static char *my_name; -Index: b/lisp/mail/feedmail.el -=================================================================== --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el -@@ -1323,7 +1323,12 @@ +@@ -1327,7 +1327,12 @@ "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") @@ -60,8 +56,6 @@ Index: b/lisp/mail/feedmail.el nil errors-to nil "-oi" "-t") ;; provide envelope "from" to sendmail; results will vary (list "-f" user-mail-address) -Index: b/lisp/mail/sendmail.el -=================================================================== --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -52,7 +52,12 @@ @@ -78,11 +72,9 @@ Index: b/lisp/mail/sendmail.el "Program used to send messages." :group 'mail :type 'file) -Index: b/lisp/gnus/message.el -=================================================================== --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el -@@ -4520,7 +4520,13 @@ +@@ -4594,7 +4594,13 @@ "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") diff --git a/debian/patches/debian-adjust-mail-from-addresses.diff b/debian/patches/debian-adjust-mail-from-addresses.diff index 349a3c59496..0b649d21500 100644 --- a/debian/patches/debian-adjust-mail-from-addresses.diff +++ b/debian/patches/debian-adjust-mail-from-addresses.diff @@ -7,13 +7,9 @@ This is correct for Debian systems where we know the MTA should be trusted. - * The default mail-from-style is 'system-default rather than 'angles. - -Index: b/lisp/gnus/message.el -=================================================================== --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el -@@ -808,9 +808,14 @@ +@@ -825,9 +825,14 @@ (const never) (const ask))) @@ -31,16 +27,3 @@ Index: b/lisp/gnus/message.el :group 'message-sending :link '(custom-manual "(message)Mail Variables") :type 'boolean) -Index: b/lisp/mail/sendmail.el -=================================================================== ---- a/lisp/mail/sendmail.el -+++ b/lisp/mail/sendmail.el -@@ -58,7 +58,7 @@ - :type 'file) - - ;;;###autoload --(defcustom mail-from-style 'angles -+(defcustom mail-from-style 'system-default - "Specifies how \"From:\" fields look. - - If `nil', they contain just the return address like: diff --git a/debian/patches/debian-startup.diff b/debian/patches/debian-startup.diff index 92d6e803bca..22ea15a696a 100644 --- a/debian/patches/debian-startup.diff +++ b/debian/patches/debian-startup.diff @@ -7,13 +7,11 @@ * The global variable debian-emacs-flavor is bound to 'emacs23. Author: Rob Browning -Index: b/lisp/startup.el -=================================================================== --- a/lisp/startup.el +++ b/lisp/startup.el -@@ -394,6 +394,10 @@ - (setq tutorial-directory (file-name-as-directory - (expand-file-name "tutorials" data-directory)))) +@@ -393,6 +393,10 @@ + :type 'directory + :initialize 'custom-initialize-delay) +(defconst debian-emacs-flavor 'emacs23 + "A symbol representing the particular debian flavor of emacs running. @@ -22,7 +20,7 @@ Index: b/lisp/startup.el (defun normal-top-level-add-subdirs-to-load-path () "Add all subdirectories of current directory to `load-path'. More precisely, this uses only the subdirectories whose names -@@ -977,8 +981,21 @@ +@@ -955,8 +959,21 @@ ;; be loaded from site-run-file and wants to test if -q was given ;; should check init-file-user instead, since that is already set. ;; See cus-edit.el for an example. diff --git a/debian/patches/fix-dynamic-menus.diff b/debian/patches/fix-dynamic-menus.diff deleted file mode 100644 index e7f51dc01d8..00000000000 --- a/debian/patches/fix-dynamic-menus.diff +++ /dev/null @@ -1,199 +0,0 @@ -* Emacs should properly render dynamically generated menus. - Patch: fix-dynamic-menus.diff - Originally-reported-by: Baylis Shanks - Date: Sat, 10 Oct 2009 22:15:05 UTC - Added-by: Rob Browning - Status: incorporated upstream - Bug: 550541 - - This Debian patch is taken from this upstream commit: - - commit 3715ffe3e3b2c64d113bf26d94aab559f8559e83 - Author: Jan Djärv - Date: Wed Sep 2 17:03:20 2009 +0000 - -Index: b/src/ChangeLog -=================================================================== ---- a/src/ChangeLog -+++ b/src/ChangeLog -@@ -1,3 +1,19 @@ -+2009-09-02 Jan Djärv -+ -+ * xterm.h: Rename x_non_menubar_window_to_frame to -+ x_menubar_window_to_frame -+ -+ * xterm.c: Remove declarations also in xterm.h -+ (XTmouse_position): Do not return valid positions -+ for clicks in the menubar and the toolbar for Gtk+. -+ -+ * xfns.c (x_any_window_to_frame): Assume less about Gtk+ internals, -+ if the widget for the event has the same top level as a frame, -+ return the frame. -+ (x_menubar_window_to_frame): Detect menu bar even with Gtk+ -+ internal windows, bug #4122. -+ (x_non_menubar_window_to_frame): Remove. -+ - 2009-07-29 Chong Yidong - - * Version 23.1 released. -Index: b/src/xfns.c -=================================================================== ---- a/src/xfns.c -+++ b/src/xfns.c -@@ -374,10 +374,7 @@ - #ifdef USE_GTK - GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); - if (gwdesc != 0 -- && (gwdesc == x->widget -- || gwdesc == x->edit_widget -- || gwdesc == x->vbox_widget -- || gwdesc == x->menubar_widget)) -+ && gtk_widget_get_toplevel (gwdesc) == x->widget) - found = f; - #else - if (wdesc == XtWindow (x->widget) -@@ -398,54 +395,6 @@ - return found; - } - --/* Likewise, but exclude the menu bar widget. */ -- --struct frame * --x_non_menubar_window_to_frame (dpyinfo, wdesc) -- struct x_display_info *dpyinfo; -- int wdesc; --{ -- Lisp_Object tail, frame; -- struct frame *f; -- struct x_output *x; -- -- if (wdesc == None) return 0; -- -- for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) -- { -- frame = XCAR (tail); -- if (!FRAMEP (frame)) -- continue; -- f = XFRAME (frame); -- if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo) -- continue; -- x = f->output_data.x; -- /* This frame matches if the window is any of its widgets. */ -- if (x->hourglass_window == wdesc) -- return f; -- else if (x->widget) -- { --#ifdef USE_GTK -- GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); -- if (gwdesc != 0 -- && (gwdesc == x->widget -- || gwdesc == x->edit_widget -- || gwdesc == x->vbox_widget)) -- return f; --#else -- if (wdesc == XtWindow (x->widget) -- || wdesc == XtWindow (x->column_widget) -- || wdesc == XtWindow (x->edit_widget)) -- return f; --#endif -- } -- else if (FRAME_X_WINDOW (f) == wdesc) -- /* A tooltip frame. */ -- return f; -- } -- return 0; --} -- - /* Likewise, but consider only the menu bar widget. */ - - struct frame * -@@ -473,15 +422,14 @@ - if (x->menubar_widget) - { - GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); -- int found = 0; - -- BLOCK_INPUT; -+ /* This gives false positives, but the rectangle check in xterm.c -+ where this is called takes care of that. */ - if (gwdesc != 0 - && (gwdesc == x->menubar_widget -- || gtk_widget_get_parent (gwdesc) == x->menubar_widget)) -- found = 1; -- UNBLOCK_INPUT; -- if (found) return f; -+ || gtk_widget_is_ancestor (x->menubar_widget, gwdesc) -+ || gtk_widget_is_ancestor (gwdesc, x->menubar_widget))) -+ return f; - } - #else - if (x->menubar_widget -Index: b/src/xterm.c -=================================================================== ---- a/src/xterm.c -+++ b/src/xterm.c -@@ -109,8 +109,6 @@ - #if defined (USE_X_TOOLKIT) || defined (USE_GTK) - - extern void free_frame_menubar P_ ((struct frame *)); --extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, -- int)); - #endif - - #ifdef USE_X_TOOLKIT -@@ -143,11 +141,6 @@ - - #endif /* USE_X_TOOLKIT */ - --#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) --#define x_any_window_to_frame x_window_to_frame --#define x_top_window_to_frame x_window_to_frame --#endif -- - #ifdef USE_X_TOOLKIT - #include "widget.h" - #ifndef XtNinitialState -@@ -3915,7 +3908,14 @@ - - if (child == None || child == win) - break; -- -+#ifdef USE_GTK -+ /* We don't wan't to know the innermost window. We -+ want the edit window. For non-Gtk+ the innermost -+ window is the edit window. For Gtk+ it might not -+ be. It might be the tool bar for example. */ -+ if (x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win)) -+ break; -+#endif - win = child; - parent_x = win_x; - parent_y = win_y; -@@ -3932,8 +3932,14 @@ - parent_{x,y} are invalid, but that's okay, because we'll - never use them in that case.) */ - -+#ifdef USE_GTK -+ /* We don't wan't to know the innermost window. We -+ want the edit window. */ -+ f1 = x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win); -+#else - /* Is win one of our frames? */ - f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win); -+#endif - - #ifdef USE_X_TOOLKIT - /* If we end up with the menu bar window, say it's not -Index: b/src/xterm.h -=================================================================== ---- a/src/xterm.h -+++ b/src/xterm.h -@@ -374,7 +374,7 @@ - - #if defined (USE_X_TOOLKIT) || defined (USE_GTK) - extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); --extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); -+extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); - extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); - #endif - diff --git a/debian/patches/fix-flymake-xmlstarlet-invocation.diff b/debian/patches/fix-flymake-xmlstarlet-invocation.diff index 4d624906caa..1ce66fd5851 100644 --- a/debian/patches/fix-flymake-xmlstarlet-invocation.diff +++ b/debian/patches/fix-flymake-xmlstarlet-invocation.diff @@ -9,11 +9,9 @@ Emacs invokes xmlstarlet rather than xml, which is the correct executable name on Debian systems. -Index: b/lisp/progmodes/flymake.el -=================================================================== --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el -@@ -1754,7 +1754,7 @@ +@@ -1759,7 +1759,7 @@ ;;;; xml-specific init-cleanup routines (defun flymake-xml-init () diff --git a/debian/patches/fix-gtk-scroll-bar-events.diff b/debian/patches/fix-gtk-scroll-bar-events.diff deleted file mode 100644 index dc5a8cbf79c..00000000000 --- a/debian/patches/fix-gtk-scroll-bar-events.diff +++ /dev/null @@ -1,115 +0,0 @@ -* Emacs should no longer treat a click in a GTK+ scroll bar as a buffer click. - Patch: fix-gtk-scroll-bar-events.diff - Originally-reported-by: Eugen Dedu - Date: Fri, 11 Dec 2009 10:12:24 +0100 - Added-by: Rob Browning - Status: incorporated upstream - Bug: 560573 - - The Debian patch is taken from this upstream commit: - - From: Jan Djärv - Date: Fri, 6 Nov 2009 08:30:43 +0000 (+0000) - Subject: Fix bug #4870, issues 3 and 4. - X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=emacs.git;a=commitdiff_plain;h=05caf88f056600a89b434982df4bda33a532b995 - -Index: b/src/ChangeLog -=================================================================== ---- a/src/ChangeLog -+++ b/src/ChangeLog -@@ -1,4 +1,13 @@ - 2009-09-02 Jan Djärv -+2009-11-06 Jan Djärv -+ -+ * gtkutil.c (xg_event_is_for_scrollbar): New function (bug#4870). -+ -+ * gtkutil.h: Declare xg_event_is_for_scrollbar (bug#4870). -+ -+ * xterm.c (handle_one_xevent): Call xg_event_is_for_scrollbar for -+ ButtonPressRelease and MotionNotify (bug#4870). -+ - - * xterm.h: Rename x_non_menubar_window_to_frame to - x_menubar_window_to_frame -Index: b/src/gtkutil.c -=================================================================== ---- a/src/gtkutil.c -+++ b/src/gtkutil.c -@@ -3401,6 +3401,38 @@ - } - } - -+/* Return non-zero if EVENT is for a scroll bar in frame F. -+ When the same X window is used for several Gtk+ widgets, we cannot -+ say for sure based on the X window alone if an event is for the -+ frame. This function does additional checks. -+ -+ Return non-zero if the event is for a scroll bar, zero otherwise. */ -+ -+int -+xg_event_is_for_scrollbar (f, event) -+ FRAME_PTR f; -+ XEvent *event; -+{ -+ int retval = 0; -+ -+ if (f && event->type == ButtonPress) -+ { -+ /* Check if press occurred outside the edit widget. */ -+ GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); -+ retval = gdk_display_get_window_at_pointer (gdpy, NULL, NULL) -+ != f->output_data.x->edit_widget->window; -+ } -+ else if (f && (event->type != ButtonRelease || event->type != MotionNotify)) -+ { -+ /* If we are releasing or moving the scroll bar, it has the grab. */ -+ retval = gtk_grab_get_current () != 0 -+ && gtk_grab_get_current () != f->output_data.x->edit_widget; -+ } -+ -+ return retval; -+} -+ -+ - - /*********************************************************************** - Tool bar functions -Index: b/src/gtkutil.h -=================================================================== ---- a/src/gtkutil.h -+++ b/src/gtkutil.h -@@ -179,7 +179,7 @@ - int portion, - int position, - int whole)); -- -+extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event)); - - extern void update_frame_tool_bar P_ ((FRAME_PTR f)); - extern void free_frame_tool_bar P_ ((FRAME_PTR f)); -Index: b/src/xterm.c -=================================================================== ---- a/src/xterm.c -+++ b/src/xterm.c -@@ -6749,6 +6749,10 @@ - clear_mouse_face (dpyinfo); - } - -+#ifdef USE_GTK -+ if (f && xg_event_is_for_scrollbar (f, &event)) -+ f = 0; -+#endif - if (f) - { - -@@ -6905,6 +6909,10 @@ - else - f = x_window_to_frame (dpyinfo, event.xbutton.window); - -+#ifdef USE_GTK -+ if (f && xg_event_is_for_scrollbar (f, &event)) -+ f = 0; -+#endif - if (f) - { - /* Is this in the tool-bar? */ diff --git a/debian/patches/fix-rmail-capitalized-month-names.diff b/debian/patches/fix-rmail-capitalized-month-names.diff deleted file mode 100644 index c8f3b80e8ba..00000000000 --- a/debian/patches/fix-rmail-capitalized-month-names.diff +++ /dev/null @@ -1,40 +0,0 @@ -* Rmail can now handle capitilized month names. - Patch: fix-rmail-capitalized-month-names.diff - Provided-by: Sven Joachim - Originally-reported-by: Jeroen Nijhof - Date: Thu, 06 Aug 2009 22:51:47 +0200 - Added-by: Rob Browning - Status: incorporated upstream - Bug: 540234 - - Rmail can not handle Date lines that have a capitalized month name - like "Date: Thu, 06 Aug 2009 18:33:32 +0100". - -Index: b/lisp/mail/rmailsum.el -=================================================================== ---- a/lisp/mail/rmailsum.el -+++ b/lisp/mail/rmailsum.el -@@ -518,16 +518,19 @@ - (concat (save-excursion - (if (not (re-search-forward "^Date:" nil t)) - " " -- (cond ((re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)" -- (line-end-position) t) -+ ;; Match month names case-insensitively -+ (cond ((let ((case-fold-search t)) -+ (re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)" -+ (line-end-position) t)) - (format "%2d-%3s" - (string-to-number (buffer-substring - (match-beginning 2) - (match-end 2))) - (buffer-substring - (match-beginning 4) (match-end 4)))) -- ((re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)" -- (line-end-position) t) -+ ((let ((case-fold-search t)) -+ (re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)" -+ (line-end-position) t)) - (format "%2d-%3s" - (string-to-number (buffer-substring - (match-beginning 4) diff --git a/debian/patches/handle-dfsg-split.diff b/debian/patches/handle-dfsg-split.diff index 80b172efdc1..cad5ae3303f 100644 --- a/debian/patches/handle-dfsg-split.diff +++ b/debian/patches/handle-dfsg-split.diff @@ -18,11 +18,9 @@ Added-by: Rob Browning Status: new -Index: b/lisp/help.el -=================================================================== --- a/lisp/help.el +++ b/lisp/help.el -@@ -297,6 +297,14 @@ +@@ -301,6 +301,14 @@ (goto-address-mode 1) (goto-char (point-min))) @@ -37,7 +35,7 @@ Index: b/lisp/help.el (defun describe-distribution () "Display info on how to obtain the latest version of GNU Emacs." (interactive) -@@ -310,7 +318,7 @@ +@@ -314,7 +322,7 @@ (defun describe-gnu-project () "Display info on the GNU project." (interactive) @@ -46,8 +44,6 @@ Index: b/lisp/help.el (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2") -Index: b/Makefile.in -=================================================================== --- a/Makefile.in +++ b/Makefile.in @@ -139,12 +139,7 @@ @@ -55,11 +51,11 @@ Index: b/Makefile.in # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ -INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ -- ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc \ -- flymake forms gnus idlwave info mairix-el message mh-e \ -- newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember \ -- sasl sc ses sieve smtpmail speedbar tramp url vip viper \ -- widget woman +- ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ +- eshell eudc flymake forms gnus idlwave info mairix-el \ +- message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ +- reftex remember sasl sc semantic ses sieve smtpmail speedbar \ +- tramp url vip viper widget woman +INFO_FILES=efaq # Directory for local state files for all programs. @@ -84,7 +80,7 @@ Index: b/Makefile.in $(srcdir)/oldXMenu/Makefile.in \ $(srcdir)/lwlib/Makefile.in \ $(srcdir)/leim/Makefile.in \ -@@ -699,10 +691,7 @@ +@@ -701,10 +693,7 @@ (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean) (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) @@ -95,7 +91,7 @@ Index: b/Makefile.in (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' -@@ -718,10 +707,7 @@ +@@ -720,10 +709,7 @@ (cd oldXMenu; $(MAKE) $(MFLAGS) clean) (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) @@ -106,7 +102,7 @@ Index: b/Makefile.in (cd leim; $(MAKE) $(MFLAGS) clean) ### `bootclean' -@@ -742,10 +728,7 @@ +@@ -744,10 +730,7 @@ (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) @@ -117,7 +113,7 @@ Index: b/Makefile.in (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) ${top_distclean} -@@ -758,10 +741,7 @@ +@@ -760,10 +743,7 @@ (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) @@ -128,18 +124,18 @@ Index: b/Makefile.in (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) ${top_bootclean} -@@ -806,10 +786,7 @@ +@@ -808,10 +788,7 @@ .PHONY: info dvi dist check html info-real: -- -(cd doc/emacs; $(MAKE) $(MFLAGS) info) - -(cd doc/misc; $(MAKE) $(MFLAGS) info) -- -(cd doc/lispref; $(MAKE) $(MFLAGS) info) -- -(cd doc/lispintro; $(MAKE) $(MFLAGS) info) +- (cd doc/emacs; $(MAKE) $(MFLAGS) info) + (cd doc/misc; $(MAKE) $(MFLAGS) info) +- (cd doc/lispref; $(MAKE) $(MFLAGS) info) +- (cd doc/lispintro; $(MAKE) $(MFLAGS) info) force-info: - # Note that man/Makefile knows how to -@@ -843,10 +820,7 @@ + # Note that man/Makefile knows how to put the info files in $(srcdir), +@@ -850,10 +827,7 @@ echo "info/dir is OK" dvi: @@ -150,11 +146,9 @@ Index: b/Makefile.in #### Bootstrapping. -Index: b/doc/misc/Makefile.in -=================================================================== --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in -@@ -38,96 +38,10 @@ +@@ -38,104 +38,10 @@ # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ @@ -167,7 +161,10 @@ Index: b/doc/misc/Makefile.in - $(infodir)/dbus \ - $(infodir)/dired-x \ - $(infodir)/ebrowse \ +- $(infodir)/ede \ - $(infodir)/ediff \ +- $(infodir)/edt \ +- $(infodir)/eieio \ - $(infodir)/emacs-mime \ - $(infodir)/epa \ - $(infodir)/erc \ @@ -192,6 +189,7 @@ Index: b/doc/misc/Makefile.in - $(infodir)/reftex \ - $(infodir)/sasl \ - $(infodir)/sc \ +- $(infodir)/semantic \ - $(infodir)/ses \ - $(infodir)/sieve \ - $(infodir)/smtpmail \ @@ -214,7 +212,10 @@ Index: b/doc/misc/Makefile.in - dbus.dvi \ - dired-x.dvi \ - ebrowse.dvi \ +- ede.dvi \ - ediff.dvi \ +- edt.dvi \ +- eieio.dvi \ - emacs-mime.dvi \ - epa.dvi \ - erc.dvi \ @@ -239,6 +240,7 @@ Index: b/doc/misc/Makefile.in - remember.dvi \ - sasl.dvi \ - sc.dvi \ +- semantic.dvi \ - ses.dvi \ - sieve.dvi \ - smtpmail.dvi \ @@ -251,9 +253,9 @@ Index: b/doc/misc/Makefile.in - woman.dvi + faq.dvi - - TEXI2DVI = texi2dvi -@@ -154,278 +68,12 @@ + PDF_TARGETS = \ + ada-mode.pdf \ +@@ -213,150 +119,6 @@ # In a distribution of Emacs, the Info files should be up to date. ## "short" target names for convenience, to just rebuild one manual. @@ -262,108 +264,167 @@ Index: b/doc/misc/Makefile.in - cd $(srcdir); $(MAKEINFO) ada-mode.texi -ada-mode.dvi: ada-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi +-ada-mode.pdf: ada-mode.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi - -auth : $(infodir)/auth -$(infodir)/auth: auth.texi - cd $(srcdir); $(MAKEINFO) auth.texi -auth.dvi: auth.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi +-auth.pdf: auth.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi - -autotype : $(infodir)/autotype -$(infodir)/autotype: autotype.texi - cd $(srcdir); $(MAKEINFO) autotype.texi -autotype.dvi: autotype.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi +-autotype.pdf: autotype.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi - -calc : $(infodir)/calc -$(infodir)/calc: calc.texi - cd $(srcdir); $(MAKEINFO) calc.texi -calc.dvi: calc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi +-calc.pdf: calc.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi - -ccmode : $(infodir)/ccmode -$(infodir)/ccmode: cc-mode.texi - cd $(srcdir); $(MAKEINFO) cc-mode.texi -cc-mode.dvi: cc-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi +-cc-mode.pdf: cc-mode.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi - -cl : $(infodir)/cl -$(infodir)/cl: cl.texi - cd $(srcdir); $(MAKEINFO) cl.texi -cl.dvi: cl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi +-cl.pdf: cl.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi - -dbus : $(infodir)/dbus -$(infodir)/dbus: dbus.texi - cd $(srcdir); $(MAKEINFO) dbus.texi -dbus.dvi: dbus.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi +-dbus.pdf: dbus.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi - -dired-x : $(infodir)/dired-x -$(infodir)/dired-x: dired-x.texi - cd $(srcdir); $(MAKEINFO) dired-x.texi -dired-x.dvi: dired-x.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi +-dired-x.pdf: dired-x.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi - -ebrowse : $(infodir)/ebrowse -$(infodir)/ebrowse: ebrowse.texi - cd $(srcdir); $(MAKEINFO) ebrowse.texi -ebrowse.dvi: ebrowse.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi +-ebrowse.pdf: ebrowse.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi +- +-ede : $(infodir)/ede +-$(infodir)/ede: ede.texi +- cd $(srcdir); $(MAKEINFO) ede.texi +-ede.dvi: ede.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi +-ede.pdf: ede.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi - -ediff : $(infodir)/ediff -$(infodir)/ediff: ediff.texi - cd $(srcdir); $(MAKEINFO) ediff.texi -ediff.dvi: ediff.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi +-ediff.pdf: ediff.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi +- +-edt : $(infodir)/edt +-$(infodir)/edt: edt.texi +- cd $(srcdir); $(MAKEINFO) edt.texi +-edt.dvi: edt.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi +-edt.pdf: edt.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi +- +-eieio : $(infodir)/eieio +-$(infodir)/eieio: eieio.texi +- cd $(srcdir); $(MAKEINFO) eieio.texi +-eieio.dvi: eieio.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi +-eieio.pdf: eieio.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi - -emacs-mime : $(infodir)/emacs-mime -$(infodir)/emacs-mime: emacs-mime.texi - cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi -emacs-mime.dvi: emacs-mime.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi +-emacs-mime.pdf: emacs-mime.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi - -epa : $(infodir)/epa -$(infodir)/epa: epa.texi - cd $(srcdir); $(MAKEINFO) epa.texi -epa.dvi: epa.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi +-epa.pdf: epa.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi - -erc : $(infodir)/erc -$(infodir)/erc: erc.texi - cd $(srcdir); $(MAKEINFO) erc.texi -erc.dvi: erc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi +-erc.pdf: erc.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi - -eshell : $(infodir)/eshell -$(infodir)/eshell: eshell.texi - cd $(srcdir); $(MAKEINFO) eshell.texi -eshell.dvi: eshell.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi +-eshell.pdf: eshell.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi - -eudc : $(infodir)/eudc -$(infodir)/eudc: eudc.texi - cd $(srcdir); $(MAKEINFO) eudc.texi -eudc.dvi: eudc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi +-eudc.pdf: eudc.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi - efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi cd $(srcdir); $(MAKEINFO) faq.texi - faq.dvi: faq.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi +@@ -365,249 +127,6 @@ + faq.pdf: faq.texi + $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi -flymake : $(infodir)/flymake -$(infodir)/flymake: flymake.texi - cd $(srcdir); $(MAKEINFO) flymake.texi -flymake.dvi: flymake.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi +-flymake.pdf: flymake.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi - -forms : $(infodir)/forms -$(infodir)/forms: forms.texi - cd $(srcdir); $(MAKEINFO) forms.texi -forms.dvi: forms.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi +-forms.pdf: forms.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi - -# gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(infodir)/gnus @@ -374,6 +435,11 @@ Index: b/doc/misc/Makefile.in - $(ENVADD) $(TEXI2DVI) gnustmp.texi - cp gnustmp.dvi $*.dvi - rm gnustmp.* +-gnus.pdf: gnus.texi gnus-faq.texi +- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi +- $(ENVADD) $(TEXI2PDF) gnustmp.texi +- cp gnustmp.pdf $@ +- rm gnustmp.* - -# This is produced with --no-split to avoid making files whose -# names clash on DOS 8+3 filesystems @@ -382,6 +448,8 @@ Index: b/doc/misc/Makefile.in - cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi -idlwave.dvi: idlwave.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi +-idlwave.pdf: idlwave.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi - -# The following target uses an explicit -o switch to work around -# the @setfilename directive in info.texi, which is required for @@ -391,152 +459,206 @@ Index: b/doc/misc/Makefile.in - cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@ -info.dvi: info.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi +-info.pdf: info.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi - -mairix-el : $(infodir)/mairix-el -$(infodir)/mairix-el: mairix-el.texi - cd $(srcdir); $(MAKEINFO) mairix-el.texi -mairix-el.dvi: mairix-el.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi +-mairix-el.pdf: mairix-el.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi - -message : $(infodir)/message -$(infodir)/message: message.texi - cd $(srcdir); $(MAKEINFO) message.texi -message.dvi: message.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi +-message.pdf: message.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi - -mh-e : $(infodir)/mh-e -$(infodir)/mh-e: mh-e.texi - cd $(srcdir); $(MAKEINFO) mh-e.texi -mh-e.dvi: mh-e.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi +-mh-e.pdf: mh-e.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi - -newsticker : $(infodir)/newsticker -$(infodir)/newsticker: newsticker.texi - cd $(srcdir); $(MAKEINFO) newsticker.texi -newsticker.dvi: newsticker.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi +-newsticker.pdf: newsticker.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi - -nxml-mode : $(infodir)/nxml-mode -$(infodir)/nxml-mode: nxml-mode.texi - cd $(srcdir); $(MAKEINFO) nxml-mode.texi -nxml-mode.dvi: nxml-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi +-nxml-mode.pdf: nxml-mode.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi - -org : $(infodir)/org -$(infodir)/org: org.texi - cd $(srcdir); $(MAKEINFO) org.texi -org.dvi: org.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi +-org.pdf: org.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi - -pcl-cvs : $(infodir)/pcl-cvs -$(infodir)/pcl-cvs: pcl-cvs.texi - cd $(srcdir); $(MAKEINFO) pcl-cvs.texi -pcl-cvs.dvi: pcl-cvs.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi +-pcl-cvs.pdf: pcl-cvs.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi - -pgg : $(infodir)/pgg -$(infodir)/pgg: pgg.texi - cd $(srcdir); $(MAKEINFO) pgg.texi -pgg.dvi: pgg.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi +-pgg.pdf: pgg.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi - -rcirc : $(infodir)/rcirc -$(infodir)/rcirc: rcirc.texi - cd $(srcdir); $(MAKEINFO) rcirc.texi -rcirc.dvi: rcirc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi +-rcirc.pdf: rcirc.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi - -reftex : $(infodir)/reftex -$(infodir)/reftex: reftex.texi - cd $(srcdir); $(MAKEINFO) reftex.texi -reftex.dvi: reftex.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi +-reftex.pdf: reftex.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi - -remember : $(infodir)/remember -$(infodir)/remember: remember.texi - cd $(srcdir); $(MAKEINFO) remember.texi -remember.dvi: remember.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi +-remember.pdf: remember.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi - -sasl : $(infodir)/sasl -$(infodir)/sasl: sasl.texi - cd $(srcdir); $(MAKEINFO) sasl.texi -sasl.dvi: sasl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi +-sasl.pdf: sasl.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi - -sc : $(infodir)/sc -$(infodir)/sc: sc.texi - cd $(srcdir); $(MAKEINFO) sc.texi -sc.dvi: sc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi +-sc.pdf: sc.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi +- +-semantic : $(infodir)/semantic +-$(infodir)/semantic: semantic.texi sem-user.texi +- cd $(srcdir); $(MAKEINFO) semantic.texi +-semantic.dvi: semantic.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi +-semantic.pdf: semantic.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi - -ses : $(infodir)/ses -$(infodir)/ses: ses.texi - cd $(srcdir); $(MAKEINFO) ses.texi -ses.dvi: ses.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi +-ses.pdf: ses.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi - -sieve : $(infodir)/sieve -$(infodir)/sieve: sieve.texi - cd $(srcdir); $(MAKEINFO) sieve.texi -sieve.dvi: sieve.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi +-sieve.pdf: sieve.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi - -smtpmail : $(infodir)/smtpmail -$(infodir)/smtpmail: smtpmail.texi - cd $(srcdir); $(MAKEINFO) smtpmail.texi -smtpmail.dvi: smtpmail.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi +-smtpmail.pdf: smtpmail.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi - -speedbar : $(infodir)/speedbar -$(infodir)/speedbar: speedbar.texi - cd $(srcdir); $(MAKEINFO) speedbar.texi -speedbar.dvi: speedbar.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi +-speedbar.pdf: speedbar.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi - -tramp : $(infodir)/tramp -$(infodir)/tramp: tramp.texi trampver.texi - cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi -tramp.dvi: tramp.texi trampver.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi +-tramp.pdf: tramp.texi trampver.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi - -url : $(infodir)/url -$(infodir)/url: url.texi - cd $(srcdir); $(MAKEINFO) url.texi -url.dvi: url.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi +-url.pdf: url.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi - -vip : $(infodir)/vip -$(infodir)/vip: vip.texi - cd $(srcdir); $(MAKEINFO) vip.texi -vip.dvi: vip.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi +-vip.pdf: vip.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi - -viper : $(infodir)/viper -$(infodir)/viper: viper.texi - cd $(srcdir); $(MAKEINFO) viper.texi -viper.dvi: viper.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi +-viper.pdf: viper.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi - -widget : $(infodir)/widget -$(infodir)/widget: widget.texi - cd $(srcdir); $(MAKEINFO) widget.texi -widget.dvi: widget.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi +-widget.pdf: widget.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi - -woman : $(infodir)/woman -$(infodir)/woman: woman.texi - cd $(srcdir); $(MAKEINFO) woman.texi -woman.dvi: woman.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi +-woman.pdf: woman.texi +- $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi mostlyclean: -Index: b/configure.in -=================================================================== --- a/configure.in +++ b/configure.in -@@ -2952,8 +2952,8 @@ +@@ -3087,8 +3087,8 @@ CPP_NEED_TRADITIONAL=yes) AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ diff --git a/debian/patches/look-for-news-to-find-etc.diff b/debian/patches/look-for-news-to-find-etc.diff index 2aa7d64b621..859123ae911 100644 --- a/debian/patches/look-for-news-to-find-etc.diff +++ b/debian/patches/look-for-news-to-find-etc.diff @@ -10,11 +10,9 @@ licenses are in /usr/share/common-licenses), Emacs will now look for NEWS to find the etc directory instead of GNU. -Index: b/src/callproc.c -=================================================================== --- a/src/callproc.c +++ b/src/callproc.c -@@ -1521,14 +1521,14 @@ +@@ -1518,14 +1518,14 @@ srcdir = Fexpand_file_name (build_string ("../src/"), build_string (PATH_DUMPLOADSEARCH)); diff --git a/debian/patches/misc-unseparated.diff b/debian/patches/misc-unseparated.diff index 8de9cfa0416..2eb1cfc02a1 100644 --- a/debian/patches/misc-unseparated.diff +++ b/debian/patches/misc-unseparated.diff @@ -6,8 +6,6 @@ References to /usr/local/... have been changed to /usr/... as appropriate, etc. -Index: b/etc/NEWS -=================================================================== --- a/etc/NEWS +++ b/etc/NEWS @@ -14,6 +14,11 @@ @@ -20,5 +18,5 @@ Index: b/etc/NEWS +Please see /usr/share/doc/emacs23-common/README.Debian.gz. + - * Installation Changes in Emacs 23.1 + * Installation Changes in Emacs 23.2 diff --git a/debian/patches/require-movemail-use-liblockfile.diff b/debian/patches/require-movemail-use-liblockfile.diff index 9957110974d..5789b55a217 100644 --- a/debian/patches/require-movemail-use-liblockfile.diff +++ b/debian/patches/require-movemail-use-liblockfile.diff @@ -7,8 +7,6 @@ the wrong locking strategy. To disable this check, comment out require-movemail-use-liblockfile.diff in debian/patches/series. -Index: b/lib-src/movemail.c -=================================================================== --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -166,6 +166,10 @@ @@ -22,8 +20,6 @@ Index: b/lib-src/movemail.c int main (argc, argv) int argc; -Index: b/src/s/bsd-common.h -=================================================================== --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -66,7 +66,11 @@ diff --git a/debian/patches/series b/debian/patches/series index cbf570c9f51..695c4e86b26 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,8 +8,4 @@ avoid-fakemail-mail-loss.diff version-mention-debian.diff look-for-news-to-find-etc.diff fix-flymake-xmlstarlet-invocation.diff -fix-rmail-capitalized-month-names.diff -fix-dynamic-menus.diff -fix-gtk-scroll-bar-events.diff -use-zwj-and-zwnj-for-indic-scripts.diff add-unix-to-cpp-undefs.diff diff --git a/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff b/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff deleted file mode 100644 index c2afff0eb63..00000000000 --- a/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff +++ /dev/null @@ -1,39 +0,0 @@ -* Emacs should now include ZWJs and ZWNJs for all Indic scripts. - Patch: use-zwj-and-zwnj-for-indic-scripts.diff - Originally-reported-by: Praveen A - Date: Thu, 3 Dec 2009 11:51:02 UTC - Added-by: Rob Browning - Status: incorporated upstream - Bug: 559292 - - The Debian patch is taken from this upstream commit: - - From f0c7c513b71778e3767be145334e20872f6c68be Mon Sep 17 00:00:00 2001 - From: Kenichi Handa - Date: Wed, 2 Dec 2009 07:59:51 +0000 - Subject: [PATCH] Include ZWJ and ZWNJ in the patterns to shape for all Indic scripts. - -Index: b/lisp/language/indian.el -=================================================================== ---- a/lisp/language/indian.el -+++ b/lisp/language/indian.el -@@ -165,15 +165,15 @@ - "Regexp matching a composable sequence of Malayalam characters.") - - (let ((script-regexp-alist -- `((devanagari . ,devanagari-composable-pattern) -+ `((devanagari . "[\x900-\x97F\x200C\x200D]+") - (bengali . "[\x980-\x9FF\x200C\x200D]+") - (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+") - (gujarati . "[\xA80-\xAFF\x200C\x200D]+") - (oriya . "[\xB00-\xB7F\x200C\x200D]+") -- (tamil . ,tamil-composable-pattern) -+ (tamil . "[\xB80-\xBFF\x200C\x200D]+") - (telugu . "[\xC00-\xC7F\x200C\x200D]+") -- (kannada . ,kannada-composable-pattern) -- (malayalam . ,malayalam-composable-pattern)))) -+ (kannada . "[\xC80-\xCFF\x200C\x200D]+") -+ (malayalam . "[\xD00-\xD7F\x200C\x200D]+")))) - (map-char-table - #'(lambda (key val) - (let ((slot (assq val script-regexp-alist))) diff --git a/debian/patches/version-mention-debian.diff b/debian/patches/version-mention-debian.diff index b4eb830ce43..c3f50ad4ad0 100644 --- a/debian/patches/version-mention-debian.diff +++ b/debian/patches/version-mention-debian.diff @@ -3,14 +3,12 @@ Author: Rob Browning Added-by: Rob Browning -Index: b/lisp/version.el -=================================================================== --- a/lisp/version.el +++ b/lisp/version.el -@@ -57,8 +57,8 @@ +@@ -56,8 +56,8 @@ (interactive "P") (let ((version-string - (format (if (not (interactive-p)) + (format (if (not (called-interactively-p 'interactive)) - "GNU Emacs %s (%s%s%s)\n of %s on %s" - "GNU Emacs %s (%s%s%s) of %s on %s") + "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian" diff --git a/debian/rules b/debian/rules index 63b540a2901..dae9466862e 100755 --- a/debian/rules +++ b/debian/rules @@ -326,7 +326,7 @@ check-vars: @echo "movemail_bin: $(movemail_bin)" define check_diff - @if $(quilt) series | grep -e '^debian-changes-'; \ + @if $(quilt) series | grep -E '^debian-changes-'; \ then \ echo "Diffs found outside ./debian:"; \ ls debian/patches/debian-changes-*; \ @@ -354,8 +354,11 @@ prepare-release: (echo "please run prepare-release as a normal user (not root)"; \ false) # check for any uncommitted changes - @if test $$(cd debian && git-diff-files | wc -c) -ne 0; \ + @cd debian; \ + if ! git diff-files --quiet; \ then \ + git status; \ + echo; \ read -p "Uncommitted changes. Continue? [y/n] "; \ if test "$${REPLY}" != y; \ then \ @@ -364,22 +367,8 @@ prepare-release: fi # TODO: make sure we actually installed the binary. # TODO: run tests (use a check target?) - $(MAKE) -f debian/rules clean $(MAKE) -f debian/rules buildpackage - test -f ../$(src_name)_$(debian_ver).diff.gz - @if [ $$(zgrep '^---' \ - ../$(src_name)_$(debian_ver).diff.gz \ - | grep -v /debian/ | wc -c) -ne 0 ]; \ - then \ - echo "Diffs outside debian/ found, please fix and retry."; \ - echo "This probably means either something wasn't cleaned"; \ - echo "properly, or you need to do some work in debian/patches."; \ - false; \ - else \ - echo "Everything looks OK. Ready for release."; \ - echo "Don't forget to run debsign if needed."; \ - fi - + @echo "Everything looks OK. Ready for release." debian-sync: $(persistent_autogen_files) # so dh pattern rule doesn't try to handle this target @@ -460,12 +449,14 @@ confflags_x += --with-toolkit-scroll-bars # nox configure flags confflags_nox := $(confflags) confflags_nox += --with-x=no +confflags_nox += --without-gconf # lucid configure flags confflags_lucid := $(confflags) confflags_lucid += --with-x=yes confflags_lucid += --with-x-toolkit=lucid confflags_lucid += --with-toolkit-scroll-bars +confflags_lucid += --without-gconf define cfg_tree rm -rf $(1) @@ -737,4 +728,5 @@ override_dh_clean: $(persistent_autogen_files) debian/*-stamp \ configure \ src/config.in + rm -f $(nonpersistent_autogen_files) dh_clean -- 2.30.2